home *** CD-ROM | disk | FTP | other *** search
| Emacs Compiled Lisp | 1998-05-21 | 7.7 KB |
open in: 
MacOS 8.1
|
Win98
|
DOS
view JSON data
|
view as text
This file was processed as: Emacs Compiled Lisp
(other/emacsCompiledLisp).
This format is not currently supported by dexvert.
| Confidence | Program | Detection | Match Type | Support
|
|---|
| 1%
| dexvert
| Emacs Compiled Lisp (other/emacsCompiledLisp)
| magic
| Unsupported |
| 100%
| file
| Emacs/XEmacs v20 byte-compiled Lisp data
| default
| |
| 99%
| file
| data
| default
| |
| 100%
| TrID
| Emacs/XEmacs byte-compiled Lisp (generic)
| default
|
|
hex view+--------+-------------------------+-------------------------+--------+--------+
|00000000| 3b 45 4c 43 14 00 00 00 | 0a 3b 3b 3b 20 63 6f 6d |;ELC....|.;;; com|
|00000010| 70 69 6c 65 64 20 62 79 | 20 6a 75 73 74 69 6e 62 |piled by| justinb|
|00000020| 40 65 62 6f 6e 79 2e 63 | 72 61 79 2e 63 6f 6d 20 |@ebony.c|ray.com |
|00000030| 6f 6e 20 54 68 75 20 4a | 61 6e 20 32 32 20 31 34 |on Thu J|an 22 14|
|00000040| 3a 34 33 3a 33 33 20 31 | 39 39 38 0a 3b 3b 3b 20 |:43:33 1|998.;;; |
|00000050| 66 72 6f 6d 20 66 69 6c | 65 20 2f 68 6f 6d 65 2f |from fil|e /home/|
|00000060| 61 73 70 65 6e 30 37 2f | 6a 75 73 74 69 6e 62 2f |aspen07/|justinb/|
|00000070| 72 6f 6f 74 73 2f 66 72 | 65 65 77 61 72 65 2f 78 |roots/fr|eeware/x|
|00000080| 65 6d 61 63 73 2f 78 65 | 6d 61 63 73 2d 32 30 2e |emacs/xe|macs-20.|
|00000090| 33 2f 6c 69 73 70 2f 65 | 64 69 66 66 2f 61 75 74 |3/lisp/e|diff/aut|
|000000a0| 6f 2d 61 75 74 6f 6c 6f | 61 64 73 2e 65 6c 0a 3b |o-autolo|ads.el.;|
|000000b0| 3b 3b 20 65 6d 61 63 73 | 20 76 65 72 73 69 6f 6e |;; emacs| version|
|000000c0| 20 32 30 2e 33 20 22 56 | 61 74 69 63 61 6e 20 43 | 20.3 "V|atican C|
|000000d0| 69 74 79 22 20 58 45 6d | 61 63 73 20 20 4c 75 63 |ity" XEm|acs Luc|
|000000e0| 69 64 2e 0a 3b 3b 3b 20 | 62 79 74 65 63 6f 6d 70 |id..;;; |bytecomp|
|000000f0| 20 76 65 72 73 69 6f 6e | 20 32 2e 32 35 20 58 45 | version| 2.25 XE|
|00000100| 6d 61 63 73 3b 20 32 32 | 2d 4d 61 72 2d 39 36 2e |macs; 22|-Mar-96.|
|00000110| 0a 3b 3b 3b 20 6f 70 74 | 69 6d 69 7a 61 74 69 6f |.;;; opt|imizatio|
|00000120| 6e 20 69 73 20 6f 6e 2e | 0a 3b 3b 3b 20 74 68 69 |n is on.|.;;; thi|
|00000130| 73 20 66 69 6c 65 20 75 | 73 65 73 20 6f 70 63 6f |s file u|ses opco|
|00000140| 64 65 73 20 77 68 69 63 | 68 20 64 6f 20 6e 6f 74 |des whic|h do not|
|00000150| 20 65 78 69 73 74 20 69 | 6e 20 45 6d 61 63 73 20 | exist i|n Emacs |
|00000160| 31 39 2e 0a 0a 28 69 66 | 20 28 61 6e 64 20 28 62 |19...(if| (and (b|
|00000170| 6f 75 6e 64 70 20 27 65 | 6d 61 63 73 2d 76 65 72 |oundp 'e|macs-ver|
|00000180| 73 69 6f 6e 29 0a 09 20 | 28 6f 72 20 28 61 6e 64 |sion).. |(or (and|
|00000190| 20 28 62 6f 75 6e 64 70 | 20 27 65 70 6f 63 68 3a | (boundp| 'epoch:|
|000001a0| 3a 76 65 72 73 69 6f 6e | 29 20 65 70 6f 63 68 3a |:version|) epoch:|
|000001b0| 3a 76 65 72 73 69 6f 6e | 29 0a 09 20 20 20 20 20 |:version|).. |
|000001c0| 28 73 74 72 69 6e 67 2d | 6c 65 73 73 70 20 65 6d |(string-|lessp em|
|000001d0| 61 63 73 2d 76 65 72 73 | 69 6f 6e 20 22 32 30 22 |acs-vers|ion "20"|
|000001e0| 29 29 29 0a 20 20 20 20 | 28 65 72 72 6f 72 20 22 |))). |(error "|
|000001f0| 60 61 75 74 6f 2d 61 75 | 74 6f 6c 6f 61 64 73 2e |`auto-au|toloads.|
|00000200| 65 6c 27 20 77 61 73 20 | 63 6f 6d 70 69 6c 65 64 |el' was |compiled|
|00000210| 20 66 6f 72 20 45 6d 61 | 63 73 20 32 30 22 29 29 | for Ema|cs 20"))|
|00000220| 0a 0a 28 6f 72 20 28 62 | 6f 75 6e 64 70 20 27 63 |..(or (b|oundp 'c|
|00000230| 75 72 72 65 6e 74 2d 6c | 6f 61 64 2d 6c 69 73 74 |urrent-l|oad-list|
|00000240| 29 20 28 73 65 74 71 20 | 63 75 72 72 65 6e 74 2d |) (setq |current-|
|00000250| 6c 6f 61 64 2d 6c 69 73 | 74 20 6e 69 6c 29 29 0a |load-lis|t nil)).|
|00000260| 0a 0a 28 62 79 74 65 2d | 63 6f 64 65 20 22 c0 c1 |..(byte-|code "..|
|00000270| 21 ab 84 c2 c3 21 88 c0 | 87 22 20 5b 66 65 61 74 |!....!..|." [feat|
|00000280| 75 72 65 70 20 65 64 69 | 66 66 2d 61 75 74 6f 6c |urep edi|ff-autol|
|00000290| 6f 61 64 73 20 65 72 72 | 6f 72 20 22 41 6c 72 65 |oads err|or "Alre|
|000002a0| 61 64 79 20 6c 6f 61 64 | 65 64 22 5d 20 32 29 0a |ady load|ed"] 2).|
|000002b0| 23 40 32 37 20 44 69 73 | 70 6c 61 79 20 45 64 69 |#@27 Dis|play Edi|
|000002c0| 66 66 27 73 20 72 65 67 | 69 73 74 72 79 2e 1f 0a |ff's reg|istry...|
|000002d0| 28 61 75 74 6f 6c 6f 61 | 64 20 27 65 64 69 66 66 |(autoloa|d 'ediff|
|000002e0| 2d 73 68 6f 77 2d 72 65 | 67 69 73 74 72 79 20 22 |-show-re|gistry "|
|000002f0| 65 64 69 66 66 2d 6d 75 | 6c 74 22 20 27 28 23 24 |ediff-mu|lt" '(#$|
|00000300| 20 2e 20 36 39 33 29 20 | 74 20 6e 69 6c 29 0a 28 | . 693) |t nil).(|
|00000310| 64 65 66 61 6c 69 61 73 | 20 27 65 72 65 67 69 73 |defalias| 'eregis|
|00000320| 74 72 79 20 27 65 64 69 | 66 66 2d 73 68 6f 77 2d |try 'edi|ff-show-|
|00000330| 72 65 67 69 73 74 72 79 | 29 0a 23 40 31 34 38 20 |registry|).#@148 |
|00000340| 53 77 69 74 63 68 20 66 | 72 6f 6d 20 6d 75 6c 74 |Switch f|rom mult|
|00000350| 69 66 72 61 6d 65 20 64 | 69 73 70 6c 61 79 20 74 |iframe d|isplay t|
|00000360| 6f 20 73 69 6e 67 6c 65 | 2d 66 72 61 6d 65 20 64 |o single|-frame d|
|00000370| 69 73 70 6c 61 79 20 61 | 6e 64 20 62 61 63 6b 2e |isplay a|nd back.|
|00000380| 0a 54 6f 20 63 68 61 6e | 67 65 20 74 68 65 20 64 |.To chan|ge the d|
|00000390| 65 66 61 75 6c 74 2c 20 | 73 65 74 20 74 68 65 20 |efault, |set the |
|000003a0| 76 61 72 69 61 62 6c 65 | 20 60 65 64 69 66 66 2d |variable| `ediff-|
|000003b0| 77 69 6e 64 6f 77 2d 73 | 65 74 75 70 2d 66 75 6e |window-s|etup-fun|
|000003c0| 63 74 69 6f 6e 27 2c 0a | 77 68 69 63 68 20 73 65 |ction',.|which se|
|000003d0| 65 2e 1f 0a 28 61 75 74 | 6f 6c 6f 61 64 20 27 65 |e...(aut|oload 'e|
|000003e0| 64 69 66 66 2d 74 6f 67 | 67 6c 65 2d 6d 75 6c 74 |diff-tog|gle-mult|
|000003f0| 69 66 72 61 6d 65 20 22 | 65 64 69 66 66 2d 75 74 |iframe "|ediff-ut|
|00000400| 69 6c 22 20 27 28 23 24 | 20 2e 20 38 33 32 29 20 |il" '(#$| . 832) |
|00000410| 74 20 6e 69 6c 29 0a 23 | 40 31 36 33 20 45 6e 61 |t nil).#|@163 Ena|
|00000420| 62 6c 65 20 6f 72 20 64 | 69 73 61 62 6c 65 20 45 |ble or d|isable E|
|00000430| 64 69 66 66 20 74 6f 6f | 6c 62 61 72 2e 0a 57 6f |diff too|lbar..Wo|
|00000440| 72 6b 73 20 6f 6e 6c 79 | 20 69 6e 20 76 65 72 73 |rks only| in vers|
|00000450| 69 6f 6e 73 20 6f 66 20 | 45 6d 61 63 73 20 74 68 |ions of |Emacs th|
|00000460| 61 74 20 73 75 70 70 6f | 72 74 20 74 6f 6f 6c 62 |at suppo|rt toolb|
|00000470| 61 72 73 2e 0a 54 6f 20 | 63 68 61 6e 67 65 20 74 |ars..To |change t|
|00000480| 68 65 20 64 65 66 61 75 | 6c 74 2c 20 73 65 74 20 |he defau|lt, set |
|00000490| 74 68 65 20 76 61 72 69 | 61 62 6c 65 20 60 65 64 |the vari|able `ed|
|000004a0| 69 66 66 2d 75 73 65 2d | 74 6f 6f 6c 62 61 72 2d |iff-use-|toolbar-|
|000004b0| 70 27 2c 20 77 68 69 63 | 68 20 73 65 65 2e 1f 0a |p', whic|h see...|
|000004c0| 28 61 75 74 6f 6c 6f 61 | 64 20 27 65 64 69 66 66 |(autoloa|d 'ediff|
|000004d0| 2d 74 6f 67 67 6c 65 2d | 75 73 65 2d 74 6f 6f 6c |-toggle-|use-tool|
|000004e0| 62 61 72 20 22 65 64 69 | 66 66 2d 75 74 69 6c 22 |bar "edi|ff-util"|
|000004f0| 20 27 28 23 24 20 2e 20 | 31 30 35 33 29 20 74 20 | '(#$ . |1053) t |
|00000500| 6e 69 6c 29 0a 23 40 35 | 30 20 52 75 6e 20 45 64 |nil).#@5|0 Run Ed|
|00000510| 69 66 66 20 6f 6e 20 61 | 20 70 61 69 72 20 6f 66 |iff on a| pair of|
|00000520| 20 66 69 6c 65 73 2c 20 | 46 49 4c 45 2d 41 20 61 | files, |FILE-A a|
|00000530| 6e 64 20 46 49 4c 45 2d | 42 2e 1f 0a 28 61 75 74 |nd FILE-|B...(aut|
|00000540| 6f 6c 6f 61 64 20 27 65 | 64 69 66 66 2d 66 69 6c |oload 'e|diff-fil|
|00000550| 65 73 20 22 65 64 69 66 | 66 22 20 27 28 23 24 20 |es "edif|f" '(#$ |
|00000560| 2e 20 31 32 39 30 29 20 | 74 20 6e 69 6c 29 0a 23 |. 1290) |t nil).#|
|00000570| 40 35 35 20 52 75 6e 20 | 45 64 69 66 66 20 6f 6e |@55 Run |Ediff on|
|00000580| 20 74 68 72 65 65 20 66 | 69 6c 65 73 2c 20 46 49 | three f|iles, FI|
|00000590| 4c 45 2d 41 2c 20 46 49 | 4c 45 2d 42 2c 20 61 6e |LE-A, FI|LE-B, an|
|000005a0| 64 20 46 49 4c 45 2d 43 | 2e 1f 0a 28 61 75 74 6f |d FILE-C|...(auto|
|000005b0| 6c 6f 61 64 20 27 65 64 | 69 66 66 2d 66 69 6c 65 |load 'ed|iff-file|
|000005c0| 73 33 20 22 65 64 69 66 | 66 22 20 27 28 23 24 20 |s3 "edif|f" '(#$ |
|000005d0| 2e 20 31 33 39 36 29 20 | 74 20 6e 69 6c 29 0a 28 |. 1396) |t nil).(|
|000005e0| 62 79 74 65 2d 63 6f 64 | 65 20 22 c0 c1 c2 5c 22 |byte-cod|e "...\"|
|000005f0| 88 c0 c3 c4 5c 22 87 22 | 20 5b 64 65 66 61 6c 69 |....\"."| [defali|
|00000600| 61 73 20 65 64 69 66 66 | 33 20 65 64 69 66 66 2d |as ediff|3 ediff-|
|00000610| 66 69 6c 65 73 33 20 65 | 64 69 66 66 20 65 64 69 |files3 e|diff edi|
|00000620| 66 66 2d 66 69 6c 65 73 | 5d 20 33 29 0a 23 40 35 |ff-files|] 3).#@5|
|00000630| 36 20 52 75 6e 20 45 64 | 69 66 66 20 6f 6e 20 61 |6 Run Ed|iff on a|
|00000640| 20 70 61 69 72 20 6f 66 | 20 62 75 66 66 65 72 73 | pair of| buffers|
|00000650| 2c 20 42 55 46 46 45 52 | 2d 41 20 61 6e 64 20 42 |, BUFFER|-A and B|
|00000660| 55 46 46 45 52 2d 42 2e | 1f 0a 28 61 75 74 6f 6c |UFFER-B.|..(autol|
|00000670| 6f 61 64 20 27 65 64 69 | 66 66 2d 62 75 66 66 65 |oad 'edi|ff-buffe|
|00000680| 72 73 20 22 65 64 69 66 | 66 22 20 27 28 23 24 20 |rs "edif|f" '(#$ |
|00000690| 2e 20 31 35 38 36 29 20 | 74 20 6e 69 6c 29 0a 28 |. 1586) |t nil).(|
|000006a0| 64 65 66 61 6c 69 61 73 | 20 27 65 62 75 66 66 65 |defalias| 'ebuffe|
|000006b0| 72 73 20 27 65 64 69 66 | 66 2d 62 75 66 66 65 72 |rs 'edif|f-buffer|
|000006c0| 73 29 0a 23 40 36 33 20 | 52 75 6e 20 45 64 69 66 |s).#@63 |Run Edif|
|000006d0| 66 20 6f 6e 20 74 68 72 | 65 65 20 62 75 66 66 65 |f on thr|ee buffe|
|000006e0| 72 73 2c 20 42 55 46 46 | 45 52 2d 41 2c 20 42 55 |rs, BUFF|ER-A, BU|
|000006f0| 46 46 45 52 2d 42 2c 20 | 61 6e 64 20 42 55 46 46 |FFER-B, |and BUFF|
|00000700| 45 52 2d 43 2e 1f 0a 28 | 61 75 74 6f 6c 6f 61 64 |ER-C...(|autoload|
|00000710| 20 27 65 64 69 66 66 2d | 62 75 66 66 65 72 73 33 | 'ediff-|buffers3|
|00000720| 20 22 65 64 69 66 66 22 | 20 27 28 23 24 20 2e 20 | "ediff"| '(#$ . |
|00000730| 31 37 33 36 29 20 74 20 | 6e 69 6c 29 0a 28 64 65 |1736) t |nil).(de|
|00000740| 66 61 6c 69 61 73 20 27 | 65 62 75 66 66 65 72 73 |falias '|ebuffers|
|00000750| 33 20 27 65 64 69 66 66 | 2d 62 75 66 66 65 72 73 |3 'ediff|-buffers|
|00000760| 33 29 0a 23 40 32 30 34 | 20 52 75 6e 20 45 64 69 |3).#@204| Run Edi|
|00000770| 66 66 20 6f 6e 20 61 20 | 70 61 69 72 20 6f 66 20 |ff on a |pair of |
|00000780| 64 69 72 65 63 74 6f 72 | 69 65 73 2c 20 44 49 52 |director|ies, DIR|
|00000790| 31 20 61 6e 64 20 44 49 | 52 32 2c 20 63 6f 6d 70 |1 and DI|R2, comp|
|000007a0| 61 72 69 6e 67 20 66 69 | 6c 65 73 20 74 68 61 74 |aring fi|les that|
|000007b0| 20 68 61 76 65 0a 74 68 | 65 20 73 61 6d 65 20 6e | have.th|e same n|
|000007c0| 61 6d 65 20 69 6e 20 62 | 6f 74 68 2e 20 54 68 65 |ame in b|oth. The|
|000007d0| 20 74 68 69 72 64 20 61 | 72 67 75 6d 65 6e 74 2c | third a|rgument,|
|000007e0| 20 52 45 47 45 58 50 2c | 20 69 73 20 61 20 72 65 | REGEXP,| is a re|
|000007f0| 67 75 6c 61 72 20 65 78 | 70 72 65 73 73 69 6f 6e |gular ex|pression|
|00000800| 20 74 68 61 74 0a 63 61 | 6e 20 62 65 20 75 73 65 | that.ca|n be use|
|00000810| 64 20 74 6f 20 66 69 6c | 74 65 72 20 6f 75 74 20 |d to fil|ter out |
|00000820| 63 65 72 74 61 69 6e 20 | 66 69 6c 65 20 6e 61 6d |certain |file nam|
|00000830| 65 73 2e 1f 0a 28 61 75 | 74 6f 6c 6f 61 64 20 27 |es...(au|toload '|
|00000840| 65 64 69 66 66 2d 64 69 | 72 65 63 74 6f 72 69 65 |ediff-di|rectorie|
|00000850| 73 20 22 65 64 69 66 66 | 22 20 27 28 23 24 20 2e |s "ediff|" '(#$ .|
|00000860| 20 31 38 39 37 29 20 74 | 20 6e 69 6c 29 0a 28 64 | 1897) t| nil).(d|
|00000870| 65 66 61 6c 69 61 73 20 | 27 65 64 69 72 73 20 27 |efalias |'edirs '|
|00000880| 65 64 69 66 66 2d 64 69 | 72 65 63 74 6f 72 69 65 |ediff-di|rectorie|
|00000890| 73 29 0a 23 40 32 32 38 | 20 52 75 6e 20 45 64 69 |s).#@228| Run Edi|
|000008a0| 66 66 20 6f 6e 20 61 20 | 64 69 72 65 63 74 6f 72 |ff on a |director|
|000008b0| 79 2c 20 44 49 52 31 2c | 20 63 6f 6d 70 61 72 69 |y, DIR1,| compari|
|000008c0| 6e 67 20 69 74 73 20 66 | 69 6c 65 73 20 77 69 74 |ng its f|iles wit|
|000008d0| 68 20 74 68 65 69 72 20 | 72 65 76 69 73 69 6f 6e |h their |revision|
|000008e0| 73 2e 0a 54 68 65 20 73 | 65 63 6f 6e 64 20 61 72 |s..The s|econd ar|
|000008f0| 67 75 6d 65 6e 74 2c 20 | 52 45 47 45 58 50 2c 20 |gument, |REGEXP, |
|00000900| 69 73 20 61 20 72 65 67 | 75 6c 61 72 20 65 78 70 |is a reg|ular exp|
|00000910| 72 65 73 73 69 6f 6e 20 | 74 68 61 74 20 66 69 6c |ression |that fil|
|00000920| 74 65 72 73 20 74 68 65 | 20 66 69 6c 65 0a 6e 61 |ters the| file.na|
|00000930| 6d 65 73 2e 20 4f 6e 6c | 79 20 74 68 65 20 66 69 |mes. Onl|y the fi|
|00000940| 6c 65 73 20 74 68 61 74 | 20 61 72 65 20 75 6e 64 |les that| are und|
|00000950| 65 72 20 72 65 76 69 73 | 69 6f 6e 20 63 6f 6e 74 |er revis|ion cont|
|00000960| 72 6f 6c 20 61 72 65 20 | 74 61 6b 65 6e 20 69 6e |rol are |taken in|
|00000970| 74 6f 20 61 63 63 6f 75 | 6e 74 2e 1f 0a 28 61 75 |to accou|nt...(au|
|00000980| 74 6f 6c 6f 61 64 20 27 | 65 64 69 66 66 2d 64 69 |toload '|ediff-di|
|00000990| 72 65 63 74 6f 72 79 2d | 72 65 76 69 73 69 6f 6e |rectory-|revision|
|000009a0| 73 20 22 65 64 69 66 66 | 22 20 27 28 23 24 20 2e |s "ediff|" '(#$ .|
|000009b0| 20 32 32 30 31 29 20 74 | 20 6e 69 6c 29 0a 28 64 | 2201) t| nil).(d|
|000009c0| 65 66 61 6c 69 61 73 20 | 27 65 64 69 72 2d 72 65 |efalias |'edir-re|
|000009d0| 76 69 73 69 6f 6e 73 20 | 27 65 64 69 66 66 2d 64 |visions |'ediff-d|
|000009e0| 69 72 65 63 74 6f 72 79 | 2d 72 65 76 69 73 69 6f |irectory|-revisio|
|000009f0| 6e 73 29 0a 23 40 32 31 | 31 20 52 75 6e 20 45 64 |ns).#@21|1 Run Ed|
|00000a00| 69 66 66 20 6f 6e 20 74 | 68 72 65 65 20 64 69 72 |iff on t|hree dir|
|00000a10| 65 63 74 6f 72 69 65 73 | 2c 20 44 49 52 31 2c 20 |ectories|, DIR1, |
|00000a20| 44 49 52 32 2c 20 61 6e | 64 20 44 49 52 33 2c 20 |DIR2, an|d DIR3, |
|00000a30| 63 6f 6d 70 61 72 69 6e | 67 20 66 69 6c 65 73 20 |comparin|g files |
|00000a40| 74 68 61 74 0a 68 61 76 | 65 20 74 68 65 20 73 61 |that.hav|e the sa|
|00000a50| 6d 65 20 6e 61 6d 65 20 | 69 6e 20 61 6c 6c 20 74 |me name |in all t|
|00000a60| 68 72 65 65 2e 20 54 68 | 65 20 6c 61 73 74 20 61 |hree. Th|e last a|
|00000a70| 72 67 75 6d 65 6e 74 2c | 20 52 45 47 45 58 50 2c |rgument,| REGEXP,|
|00000a80| 20 69 73 20 61 20 72 65 | 67 75 6c 61 72 0a 65 78 | is a re|gular.ex|
|00000a90| 70 72 65 73 73 69 6f 6e | 20 74 68 61 74 20 63 61 |pression| that ca|
|00000aa0| 6e 20 62 65 20 75 73 65 | 64 20 74 6f 20 66 69 6c |n be use|d to fil|
|00000ab0| 74 65 72 20 6f 75 74 20 | 63 65 72 74 61 69 6e 20 |ter out |certain |
|00000ac0| 66 69 6c 65 20 6e 61 6d | 65 73 2e 1f 0a 28 61 75 |file nam|es...(au|
|00000ad0| 74 6f 6c 6f 61 64 20 27 | 65 64 69 66 66 2d 64 69 |toload '|ediff-di|
|00000ae0| 72 65 63 74 6f 72 69 65 | 73 33 20 22 65 64 69 66 |rectorie|s3 "edif|
|00000af0| 66 22 20 27 28 23 24 20 | 2e 20 32 35 35 34 29 20 |f" '(#$ |. 2554) |
|00000b00| 74 20 6e 69 6c 29 0a 28 | 64 65 66 61 6c 69 61 73 |t nil).(|defalias|
|00000b10| 20 27 65 64 69 72 73 33 | 20 27 65 64 69 66 66 2d | 'edirs3| 'ediff-|
|00000b20| 64 69 72 65 63 74 6f 72 | 69 65 73 33 29 0a 23 40 |director|ies3).#@|
|00000b30| 32 30 32 20 52 75 6e 20 | 45 64 69 66 66 20 6f 6e |202 Run |Ediff on|
|00000b40| 20 61 20 70 61 69 72 20 | 6f 66 20 64 69 72 65 63 | a pair |of direc|
|00000b50| 74 6f 72 69 65 73 2c 20 | 44 49 52 31 20 61 6e 64 |tories, |DIR1 and|
|00000b60| 20 44 49 52 32 2c 20 6d | 65 72 67 69 6e 67 20 66 | DIR2, m|erging f|
|00000b70| 69 6c 65 73 20 74 68 61 | 74 20 68 61 76 65 0a 74 |iles tha|t have.t|
|00000b80| 68 65 20 73 61 6d 65 20 | 6e 61 6d 65 20 69 6e 20 |he same |name in |
|00000b90| 62 6f 74 68 2e 20 54 68 | 65 20 74 68 69 72 64 20 |both. Th|e third |
|00000ba0| 61 72 67 75 6d 65 6e 74 | 2c 20 52 45 47 45 58 50 |argument|, REGEXP|
|00000bb0| 2c 20 69 73 20 61 20 72 | 65 67 75 6c 61 72 20 65 |, is a r|egular e|
|00000bc0| 78 70 72 65 73 73 69 6f | 6e 20 74 68 61 74 0a 63 |xpressio|n that.c|
|00000bd0| 61 6e 20 62 65 20 75 73 | 65 64 20 74 6f 20 66 69 |an be us|ed to fi|
|00000be0| 6c 74 65 72 20 6f 75 74 | 20 63 65 72 74 61 69 6e |lter out| certain|
|00000bf0| 20 66 69 6c 65 20 6e 61 | 6d 65 73 2e 1f 0a 28 61 | file na|mes...(a|
|00000c00| 75 74 6f 6c 6f 61 64 20 | 27 65 64 69 66 66 2d 6d |utoload |'ediff-m|
|00000c10| 65 72 67 65 2d 64 69 72 | 65 63 74 6f 72 69 65 73 |erge-dir|ectories|
|00000c20| 20 22 65 64 69 66 66 22 | 20 27 28 23 24 20 2e 20 | "ediff"| '(#$ . |
|00000c30| 32 38 36 38 29 20 74 20 | 6e 69 6c 29 0a 28 64 65 |2868) t |nil).(de|
|00000c40| 66 61 6c 69 61 73 20 27 | 65 64 69 72 73 2d 6d 65 |falias '|edirs-me|
|00000c50| 72 67 65 20 27 65 64 69 | 66 66 2d 6d 65 72 67 65 |rge 'edi|ff-merge|
|00000c60| 2d 64 69 72 65 63 74 6f | 72 69 65 73 29 0a 23 40 |-directo|ries).#@|
|00000c70| 33 36 31 20 4d 65 72 67 | 65 20 66 69 6c 65 73 20 |361 Merg|e files |
|00000c80| 69 6e 20 64 69 72 65 63 | 74 6f 72 69 65 73 20 44 |in direc|tories D|
|00000c90| 49 52 31 20 61 6e 64 20 | 44 49 52 32 20 75 73 69 |IR1 and |DIR2 usi|
|00000ca0| 6e 67 20 66 69 6c 65 73 | 20 69 6e 20 41 4e 43 45 |ng files| in ANCE|
|00000cb0| 53 54 4f 52 2d 44 49 52 | 20 61 73 20 61 6e 63 65 |STOR-DIR| as ance|
|00000cc0| 73 74 6f 72 73 2e 0a 45 | 64 69 66 66 20 6d 65 72 |stors..E|diff mer|
|00000cd0| 67 65 73 20 66 69 6c 65 | 73 20 74 68 61 74 20 68 |ges file|s that h|
|00000ce0| 61 76 65 20 69 64 65 6e | 74 69 63 61 6c 20 6e 61 |ave iden|tical na|
|00000cf0| 6d 65 73 20 69 6e 20 44 | 49 52 31 2c 20 44 49 52 |mes in D|IR1, DIR|
|00000d00| 32 2e 20 49 66 20 61 20 | 70 61 69 72 20 6f 66 20 |2. If a |pair of |
|00000d10| 66 69 6c 65 73 0a 69 6e | 20 44 49 52 31 20 61 6e |files.in| DIR1 an|
|00000d20| 64 20 44 49 52 32 20 64 | 6f 65 73 6e 27 74 20 68 |d DIR2 d|oesn't h|
|00000d30| 61 76 65 20 61 6e 20 61 | 6e 63 65 73 74 6f 72 20 |ave an a|ncestor |
|00000d40| 69 6e 20 41 4e 43 45 53 | 54 4f 52 2d 44 49 52 2c |in ANCES|TOR-DIR,|
|00000d50| 20 45 64 69 66 66 20 77 | 69 6c 6c 20 6d 65 72 67 | Ediff w|ill merg|
|00000d60| 65 0a 77 69 74 68 6f 75 | 74 20 61 6e 63 65 73 74 |e.withou|t ancest|
|00000d70| 6f 72 2e 20 54 68 65 20 | 66 6f 75 72 74 68 20 61 |or. The |fourth a|
|00000d80| 72 67 75 6d 65 6e 74 2c | 20 52 45 47 45 58 50 2c |rgument,| REGEXP,|
|00000d90| 20 69 73 20 61 20 72 65 | 67 75 6c 61 72 20 65 78 | is a re|gular ex|
|00000da0| 70 72 65 73 73 69 6f 6e | 20 74 68 61 74 0a 63 61 |pression| that.ca|
|00000db0| 6e 20 62 65 20 75 73 65 | 64 20 74 6f 20 66 69 6c |n be use|d to fil|
|00000dc0| 74 65 72 20 6f 75 74 20 | 63 65 72 74 61 69 6e 20 |ter out |certain |
|00000dd0| 66 69 6c 65 20 6e 61 6d | 65 73 2e 1f 0a 28 61 75 |file nam|es...(au|
|00000de0| 74 6f 6c 6f 61 64 20 27 | 65 64 69 66 66 2d 6d 65 |toload '|ediff-me|
|00000df0| 72 67 65 2d 64 69 72 65 | 63 74 6f 72 69 65 73 2d |rge-dire|ctories-|
|00000e00| 77 69 74 68 2d 61 6e 63 | 65 73 74 6f 72 20 22 65 |with-anc|estor "e|
|00000e10| 64 69 66 66 22 20 27 28 | 23 24 20 2e 20 33 31 38 |diff" '(|#$ . 318|
|00000e20| 38 29 20 74 20 6e 69 6c | 29 0a 23 40 32 32 36 20 |8) t nil|).#@226 |
|00000e30| 52 75 6e 20 45 64 69 66 | 66 20 6f 6e 20 61 20 64 |Run Edif|f on a d|
|00000e40| 69 72 65 63 74 6f 72 79 | 2c 20 44 49 52 31 2c 20 |irectory|, DIR1, |
|00000e50| 6d 65 72 67 69 6e 67 20 | 69 74 73 20 66 69 6c 65 |merging |its file|
|00000e60| 73 20 77 69 74 68 20 74 | 68 65 69 72 20 72 65 76 |s with t|heir rev|
|00000e70| 69 73 69 6f 6e 73 2e 0a | 54 68 65 20 73 65 63 6f |isions..|The seco|
|00000e80| 6e 64 20 61 72 67 75 6d | 65 6e 74 2c 20 52 45 47 |nd argum|ent, REG|
|00000e90| 45 58 50 2c 20 69 73 20 | 61 20 72 65 67 75 6c 61 |EXP, is |a regula|
|00000ea0| 72 20 65 78 70 72 65 73 | 73 69 6f 6e 20 74 68 61 |r expres|sion tha|
|00000eb0| 74 20 66 69 6c 74 65 72 | 73 20 74 68 65 20 66 69 |t filter|s the fi|
|00000ec0| 6c 65 0a 6e 61 6d 65 73 | 2e 20 4f 6e 6c 79 20 74 |le.names|. Only t|
|00000ed0| 68 65 20 66 69 6c 65 73 | 20 74 68 61 74 20 61 72 |he files| that ar|
|00000ee0| 65 20 75 6e 64 65 72 20 | 72 65 76 69 73 69 6f 6e |e under |revision|
|00000ef0| 20 63 6f 6e 74 72 6f 6c | 20 61 72 65 20 74 61 6b | control| are tak|
|00000f00| 65 6e 20 69 6e 74 6f 20 | 61 63 63 6f 75 6e 74 2e |en into |account.|
|00000f10| 1f 0a 28 61 75 74 6f 6c | 6f 61 64 20 27 65 64 69 |..(autol|oad 'edi|
|00000f20| 66 66 2d 6d 65 72 67 65 | 2d 64 69 72 65 63 74 6f |ff-merge|-directo|
|00000f30| 72 79 2d 72 65 76 69 73 | 69 6f 6e 73 20 22 65 64 |ry-revis|ions "ed|
|00000f40| 69 66 66 22 20 27 28 23 | 24 20 2e 20 33 36 33 32 |iff" '(#|$ . 3632|
|00000f50| 29 20 74 20 6e 69 6c 29 | 0a 28 64 65 66 61 6c 69 |) t nil)|.(defali|
|00000f60| 61 73 20 27 65 64 69 72 | 2d 6d 65 72 67 65 2d 72 |as 'edir|-merge-r|
|00000f70| 65 76 69 73 69 6f 6e 73 | 20 27 65 64 69 66 66 2d |evisions| 'ediff-|
|00000f80| 6d 65 72 67 65 2d 64 69 | 72 65 63 74 6f 72 79 2d |merge-di|rectory-|
|00000f90| 72 65 76 69 73 69 6f 6e | 73 29 0a 23 40 32 34 30 |revision|s).#@240|
|00000fa0| 20 52 75 6e 20 45 64 69 | 66 66 20 6f 6e 20 61 20 | Run Edi|ff on a |
|00000fb0| 64 69 72 65 63 74 6f 72 | 79 2c 20 44 49 52 31 2c |director|y, DIR1,|
|00000fc0| 20 6d 65 72 67 69 6e 67 | 20 69 74 73 20 66 69 6c | merging| its fil|
|00000fd0| 65 73 20 77 69 74 68 20 | 74 68 65 69 72 20 72 65 |es with |their re|
|00000fe0| 76 69 73 69 6f 6e 73 20 | 61 6e 64 20 61 6e 63 65 |visions |and ance|
|00000ff0| 73 74 6f 72 73 2e 0a 54 | 68 65 20 73 65 63 6f 6e |stors..T|he secon|
|00001000| 64 20 61 72 67 75 6d 65 | 6e 74 2c 20 52 45 47 45 |d argume|nt, REGE|
|00001010| 58 50 2c 20 69 73 20 61 | 20 72 65 67 75 6c 61 72 |XP, is a| regular|
|00001020| 20 65 78 70 72 65 73 73 | 69 6f 6e 20 74 68 61 74 | express|ion that|
|00001030| 20 66 69 6c 74 65 72 73 | 20 74 68 65 20 66 69 6c | filters| the fil|
|00001040| 65 0a 6e 61 6d 65 73 2e | 20 4f 6e 6c 79 20 74 68 |e.names.| Only th|
|00001050| 65 20 66 69 6c 65 73 20 | 74 68 61 74 20 61 72 65 |e files |that are|
|00001060| 20 75 6e 64 65 72 20 72 | 65 76 69 73 69 6f 6e 20 | under r|evision |
|00001070| 63 6f 6e 74 72 6f 6c 20 | 61 72 65 20 74 61 6b 65 |control |are take|
|00001080| 6e 20 69 6e 74 6f 20 61 | 63 63 6f 75 6e 74 2e 1f |n into a|ccount..|
|00001090| 0a 28 61 75 74 6f 6c 6f | 61 64 20 27 65 64 69 66 |.(autolo|ad 'edif|
|000010a0| 66 2d 6d 65 72 67 65 2d | 64 69 72 65 63 74 6f 72 |f-merge-|director|
|000010b0| 79 2d 72 65 76 69 73 69 | 6f 6e 73 2d 77 69 74 68 |y-revisi|ons-with|
|000010c0| 2d 61 6e 63 65 73 74 6f | 72 20 22 65 64 69 66 66 |-ancesto|r "ediff|
|000010d0| 22 20 27 28 23 24 20 2e | 20 34 30 30 31 29 20 74 |" '(#$ .| 4001) t|
|000010e0| 20 6e 69 6c 29 0a 28 62 | 79 74 65 2d 63 6f 64 65 | nil).(b|yte-code|
|000010f0| 20 22 c0 c1 c2 5c 22 88 | c0 c3 c4 5c 22 87 22 20 | "...\".|...\"." |
|00001100| 5b 64 65 66 61 6c 69 61 | 73 20 65 64 69 72 2d 6d |[defalia|s edir-m|
|00001110| 65 72 67 65 2d 72 65 76 | 69 73 69 6f 6e 73 2d 77 |erge-rev|isions-w|
|00001120| 69 74 68 2d 61 6e 63 65 | 73 74 6f 72 20 65 64 69 |ith-ance|stor edi|
|00001130| 66 66 2d 6d 65 72 67 65 | 2d 64 69 72 65 63 74 6f |ff-merge|-directo|
|00001140| 72 79 2d 72 65 76 69 73 | 69 6f 6e 73 2d 77 69 74 |ry-revis|ions-wit|
|00001150| 68 2d 61 6e 63 65 73 74 | 6f 72 20 65 64 69 72 73 |h-ancest|or edirs|
|00001160| 2d 6d 65 72 67 65 2d 77 | 69 74 68 2d 61 6e 63 65 |-merge-w|ith-ance|
|00001170| 73 74 6f 72 20 65 64 69 | 66 66 2d 6d 65 72 67 65 |stor edi|ff-merge|
|00001180| 2d 64 69 72 65 63 74 6f | 72 69 65 73 2d 77 69 74 |-directo|ries-wit|
|00001190| 68 2d 61 6e 63 65 73 74 | 6f 72 5d 20 33 29 0a 23 |h-ancest|or] 3).#|
|000011a0| 40 32 33 36 20 43 6f 6d | 70 61 72 65 20 57 49 4e |@236 Com|pare WIN|
|000011b0| 44 2d 41 20 61 6e 64 20 | 57 49 4e 44 2d 42 2c 20 |D-A and |WIND-B, |
|000011c0| 77 68 69 63 68 20 61 72 | 65 20 73 65 6c 65 63 74 |which ar|e select|
|000011d0| 65 64 20 62 79 20 63 6c | 69 63 6b 69 6e 67 2c 20 |ed by cl|icking, |
|000011e0| 77 6f 72 64 77 69 73 65 | 2e 0a 57 69 74 68 20 70 |wordwise|..With p|
|000011f0| 72 65 66 69 78 20 61 72 | 67 75 6d 65 6e 74 2c 20 |refix ar|gument, |
|00001200| 44 55 4d 42 2d 4d 4f 44 | 45 2c 20 6f 72 20 6f 6e |DUMB-MOD|E, or on|
|00001210| 20 61 20 6e 6f 6e 2d 77 | 69 6e 64 6f 77 69 6e 67 | a non-w|indowing|
|00001220| 20 64 69 73 70 6c 61 79 | 2c 20 77 6f 72 6b 73 20 | display|, works |
|00001230| 61 73 0a 66 6f 6c 6c 6f | 77 73 3a 0a 49 66 20 57 |as.follo|ws:.If W|
|00001240| 49 4e 44 2d 41 20 69 73 | 20 6e 69 6c 2c 20 75 73 |IND-A is| nil, us|
|00001250| 65 20 73 65 6c 65 63 74 | 65 64 20 77 69 6e 64 6f |e select|ed windo|
|00001260| 77 2e 0a 49 66 20 57 49 | 4e 44 2d 42 20 69 73 20 |w..If WI|ND-B is |
|00001270| 6e 69 6c 2c 20 75 73 65 | 20 77 69 6e 64 6f 77 20 |nil, use| window |
|00001280| 6e 65 78 74 20 74 6f 20 | 57 49 4e 44 2d 41 2e 1f |next to |WIND-A..|
|00001290| 0a 28 61 75 74 6f 6c 6f | 61 64 20 27 65 64 69 66 |.(autolo|ad 'edif|
|000012a0| 66 2d 77 69 6e 64 6f 77 | 73 2d 77 6f 72 64 77 69 |f-window|s-wordwi|
|000012b0| 73 65 20 22 65 64 69 66 | 66 22 20 27 28 23 24 20 |se "edif|f" '(#$ |
|000012c0| 2e 20 34 35 31 37 29 20 | 74 20 6e 69 6c 29 0a 23 |. 4517) |t nil).#|
|000012d0| 40 32 33 36 20 43 6f 6d | 70 61 72 65 20 57 49 4e |@236 Com|pare WIN|
|000012e0| 44 2d 41 20 61 6e 64 20 | 57 49 4e 44 2d 42 2c 20 |D-A and |WIND-B, |
|000012f0| 77 68 69 63 68 20 61 72 | 65 20 73 65 6c 65 63 74 |which ar|e select|
|00001300| 65 64 20 62 79 20 63 6c | 69 63 6b 69 6e 67 2c 20 |ed by cl|icking, |
|00001310| 6c 69 6e 65 77 69 73 65 | 2e 0a 57 69 74 68 20 70 |linewise|..With p|
|00001320| 72 65 66 69 78 20 61 72 | 67 75 6d 65 6e 74 2c 20 |refix ar|gument, |
|00001330| 44 55 4d 42 2d 4d 4f 44 | 45 2c 20 6f 72 20 6f 6e |DUMB-MOD|E, or on|
|00001340| 20 61 20 6e 6f 6e 2d 77 | 69 6e 64 6f 77 69 6e 67 | a non-w|indowing|
|00001350| 20 64 69 73 70 6c 61 79 | 2c 20 77 6f 72 6b 73 20 | display|, works |
|00001360| 61 73 0a 66 6f 6c 6c 6f | 77 73 3a 0a 49 66 20 57 |as.follo|ws:.If W|
|00001370| 49 4e 44 2d 41 20 69 73 | 20 6e 69 6c 2c 20 75 73 |IND-A is| nil, us|
|00001380| 65 20 73 65 6c 65 63 74 | 65 64 20 77 69 6e 64 6f |e select|ed windo|
|00001390| 77 2e 0a 49 66 20 57 49 | 4e 44 2d 42 20 69 73 20 |w..If WI|ND-B is |
|000013a0| 6e 69 6c 2c 20 75 73 65 | 20 77 69 6e 64 6f 77 20 |nil, use| window |
|000013b0| 6e 65 78 74 20 74 6f 20 | 57 49 4e 44 2d 41 2e 1f |next to |WIND-A..|
|000013c0| 0a 28 61 75 74 6f 6c 6f | 61 64 20 27 65 64 69 66 |.(autolo|ad 'edif|
|000013d0| 66 2d 77 69 6e 64 6f 77 | 73 2d 6c 69 6e 65 77 69 |f-window|s-linewi|
|000013e0| 73 65 20 22 65 64 69 66 | 66 22 20 27 28 23 24 20 |se "edif|f" '(#$ |
|000013f0| 2e 20 34 38 32 31 29 20 | 74 20 6e 69 6c 29 0a 23 |. 4821) |t nil).#|
|00001400| 40 32 35 31 20 52 75 6e | 20 45 64 69 66 66 20 6f |@251 Run| Ediff o|
|00001410| 6e 20 61 20 70 61 69 72 | 20 6f 66 20 72 65 67 69 |n a pair| of regi|
|00001420| 6f 6e 73 20 69 6e 20 74 | 77 6f 20 64 69 66 66 65 |ons in t|wo diffe|
|00001430| 72 65 6e 74 20 62 75 66 | 66 65 72 73 2e 0a 52 65 |rent buf|fers..Re|
|00001440| 67 69 6f 6e 73 20 28 69 | 2e 65 2e 2c 20 70 6f 69 |gions (i|.e., poi|
|00001450| 6e 74 20 61 6e 64 20 6d | 61 72 6b 29 20 61 72 65 |nt and m|ark) are|
|00001460| 20 61 73 73 75 6d 65 64 | 20 74 6f 20 62 65 20 73 | assumed| to be s|
|00001470| 65 74 20 69 6e 20 61 64 | 76 61 6e 63 65 2e 0a 54 |et in ad|vance..T|
|00001480| 68 69 73 20 66 75 6e 63 | 74 69 6f 6e 20 69 73 20 |his func|tion is |
|00001490| 65 66 66 65 63 74 69 76 | 65 20 6f 6e 6c 79 20 66 |effectiv|e only f|
|000014a0| 6f 72 20 72 65 6c 61 74 | 69 76 65 6c 79 20 73 6d |or relat|ively sm|
|000014b0| 61 6c 6c 20 72 65 67 69 | 6f 6e 73 2c 20 75 70 20 |all regi|ons, up |
|000014c0| 74 6f 20 32 30 30 0a 6c | 69 6e 65 73 2e 20 46 6f |to 200.l|ines. Fo|
|000014d0| 72 20 6c 61 72 67 65 20 | 72 65 67 69 6f 6e 73 2c |r large |regions,|
|000014e0| 20 75 73 65 20 60 65 64 | 69 66 66 2d 72 65 67 69 | use `ed|iff-regi|
|000014f0| 6f 6e 73 2d 6c 69 6e 65 | 77 69 73 65 27 2e 1f 0a |ons-line|wise'...|
|00001500| 28 61 75 74 6f 6c 6f 61 | 64 20 27 65 64 69 66 66 |(autoloa|d 'ediff|
|00001510| 2d 72 65 67 69 6f 6e 73 | 2d 77 6f 72 64 77 69 73 |-regions|-wordwis|
|00001520| 65 20 22 65 64 69 66 66 | 22 20 27 28 23 24 20 2e |e "ediff|" '(#$ .|
|00001530| 20 35 31 32 35 29 20 74 | 20 6e 69 6c 29 0a 23 40 | 5125) t| nil).#@|
|00001540| 32 38 35 20 52 75 6e 20 | 45 64 69 66 66 20 6f 6e |285 Run |Ediff on|
|00001550| 20 61 20 70 61 69 72 20 | 6f 66 20 72 65 67 69 6f | a pair |of regio|
|00001560| 6e 73 20 69 6e 20 74 77 | 6f 20 64 69 66 66 65 72 |ns in tw|o differ|
|00001570| 65 6e 74 20 62 75 66 66 | 65 72 73 2e 0a 52 65 67 |ent buff|ers..Reg|
|00001580| 69 6f 6e 73 20 28 69 2e | 65 2e 2c 20 70 6f 69 6e |ions (i.|e., poin|
|00001590| 74 20 61 6e 64 20 6d 61 | 72 6b 29 20 61 72 65 20 |t and ma|rk) are |
|000015a0| 61 73 73 75 6d 65 64 20 | 74 6f 20 62 65 20 73 65 |assumed |to be se|
|000015b0| 74 20 69 6e 20 61 64 76 | 61 6e 63 65 2e 0a 45 61 |t in adv|ance..Ea|
|000015c0| 63 68 20 72 65 67 69 6f | 6e 20 69 73 20 65 6e 6c |ch regio|n is enl|
|000015d0| 61 72 67 65 64 20 74 6f | 20 63 6f 6e 74 61 69 6e |arged to| contain|
|000015e0| 20 66 75 6c 6c 20 6c 69 | 6e 65 73 2e 0a 54 68 69 | full li|nes..Thi|
|000015f0| 73 20 66 75 6e 63 74 69 | 6f 6e 20 69 73 20 65 66 |s functi|on is ef|
|00001600| 66 65 63 74 69 76 65 20 | 66 6f 72 20 6c 61 72 67 |fective |for larg|
|00001610| 65 20 72 65 67 69 6f 6e | 73 2c 20 6f 76 65 72 20 |e region|s, over |
|00001620| 31 30 30 2d 32 30 30 0a | 6c 69 6e 65 73 2e 20 46 |100-200.|lines. F|
|00001630| 6f 72 20 73 6d 61 6c 6c | 20 72 65 67 69 6f 6e 73 |or small| regions|
|00001640| 2c 20 75 73 65 20 60 65 | 64 69 66 66 2d 72 65 67 |, use `e|diff-reg|
|00001650| 69 6f 6e 73 2d 77 6f 72 | 64 77 69 73 65 27 2e 1f |ions-wor|dwise'..|
|00001660| 0a 28 61 75 74 6f 6c 6f | 61 64 20 27 65 64 69 66 |.(autolo|ad 'edif|
|00001670| 66 2d 72 65 67 69 6f 6e | 73 2d 6c 69 6e 65 77 69 |f-region|s-linewi|
|00001680| 73 65 20 22 65 64 69 66 | 66 22 20 27 28 23 24 20 |se "edif|f" '(#$ |
|00001690| 2e 20 35 34 34 34 29 20 | 74 20 6e 69 6c 29 0a 28 |. 5444) |t nil).(|
|000016a0| 64 65 66 61 6c 69 61 73 | 20 27 65 64 69 66 66 2d |defalias| 'ediff-|
|000016b0| 6d 65 72 67 65 20 27 65 | 64 69 66 66 2d 6d 65 72 |merge 'e|diff-mer|
|000016c0| 67 65 2d 66 69 6c 65 73 | 29 0a 23 40 33 35 20 4d |ge-files|).#@35 M|
|000016d0| 65 72 67 65 20 74 77 6f | 20 66 69 6c 65 73 20 77 |erge two| files w|
|000016e0| 69 74 68 6f 75 74 20 61 | 6e 63 65 73 74 6f 72 2e |ithout a|ncestor.|
|000016f0| 1f 0a 28 61 75 74 6f 6c | 6f 61 64 20 27 65 64 69 |..(autol|oad 'edi|
|00001700| 66 66 2d 6d 65 72 67 65 | 2d 66 69 6c 65 73 20 22 |ff-merge|-files "|
|00001710| 65 64 69 66 66 22 20 27 | 28 23 24 20 2e 20 35 38 |ediff" '|(#$ . 58|
|00001720| 33 39 29 20 74 20 6e 69 | 6c 29 0a 23 40 33 32 20 |39) t ni|l).#@32 |
|00001730| 4d 65 72 67 65 20 74 77 | 6f 20 66 69 6c 65 73 20 |Merge tw|o files |
|00001740| 77 69 74 68 20 61 6e 63 | 65 73 74 6f 72 2e 1f 0a |with anc|estor...|
|00001750| 28 61 75 74 6f 6c 6f 61 | 64 20 27 65 64 69 66 66 |(autoloa|d 'ediff|
|00001760| 2d 6d 65 72 67 65 2d 66 | 69 6c 65 73 2d 77 69 74 |-merge-f|iles-wit|
|00001770| 68 2d 61 6e 63 65 73 74 | 6f 72 20 22 65 64 69 66 |h-ancest|or "edif|
|00001780| 66 22 20 27 28 23 24 20 | 2e 20 35 39 33 36 29 20 |f" '(#$ |. 5936) |
|00001790| 74 20 6e 69 6c 29 0a 28 | 64 65 66 61 6c 69 61 73 |t nil).(|defalias|
|000017a0| 20 27 65 64 69 66 66 2d | 6d 65 72 67 65 2d 77 69 | 'ediff-|merge-wi|
|000017b0| 74 68 2d 61 6e 63 65 73 | 74 6f 72 20 27 65 64 69 |th-ances|tor 'edi|
|000017c0| 66 66 2d 6d 65 72 67 65 | 2d 66 69 6c 65 73 2d 77 |ff-merge|-files-w|
|000017d0| 69 74 68 2d 61 6e 63 65 | 73 74 6f 72 29 0a 23 40 |ith-ance|stor).#@|
|000017e0| 33 33 20 4d 65 72 67 65 | 20 62 75 66 66 65 72 73 |33 Merge| buffers|
|000017f0| 20 77 69 74 68 6f 75 74 | 20 61 6e 63 65 73 74 6f | without| ancesto|
|00001800| 72 2e 1f 0a 28 61 75 74 | 6f 6c 6f 61 64 20 27 65 |r...(aut|oload 'e|
|00001810| 64 69 66 66 2d 6d 65 72 | 67 65 2d 62 75 66 66 65 |diff-mer|ge-buffe|
|00001820| 72 73 20 22 65 64 69 66 | 66 22 20 27 28 23 24 20 |rs "edif|f" '(#$ |
|00001830| 2e 20 36 31 31 35 29 20 | 74 20 6e 69 6c 29 0a 23 |. 6115) |t nil).#|
|00001840| 40 33 30 20 4d 65 72 67 | 65 20 62 75 66 66 65 72 |@30 Merg|e buffer|
|00001850| 73 20 77 69 74 68 20 61 | 6e 63 65 73 74 6f 72 2e |s with a|ncestor.|
|00001860| 1f 0a 28 61 75 74 6f 6c | 6f 61 64 20 27 65 64 69 |..(autol|oad 'edi|
|00001870| 66 66 2d 6d 65 72 67 65 | 2d 62 75 66 66 65 72 73 |ff-merge|-buffers|
|00001880| 2d 77 69 74 68 2d 61 6e | 63 65 73 74 6f 72 20 22 |-with-an|cestor "|
|00001890| 65 64 69 66 66 22 20 27 | 28 23 24 20 2e 20 36 32 |ediff" '|(#$ . 62|
|000018a0| 31 32 29 20 74 20 6e 69 | 6c 29 0a 23 40 31 32 39 |12) t ni|l).#@129|
|000018b0| 20 52 75 6e 20 45 64 69 | 66 66 20 62 79 20 6d 65 | Run Edi|ff by me|
|000018c0| 72 67 69 6e 67 20 74 77 | 6f 20 72 65 76 69 73 69 |rging tw|o revisi|
|000018d0| 6f 6e 73 20 6f 66 20 61 | 20 66 69 6c 65 2e 0a 54 |ons of a| file..T|
|000018e0| 68 65 20 66 69 6c 65 20 | 69 73 20 74 68 65 20 6f |he file |is the o|
|000018f0| 70 74 69 6f 6e 61 6c 20 | 46 49 4c 45 20 61 72 67 |ptional |FILE arg|
|00001900| 75 6d 65 6e 74 20 6f 72 | 20 74 68 65 20 66 69 6c |ument or| the fil|
|00001910| 65 20 76 69 73 69 74 65 | 64 20 62 79 20 74 68 65 |e visite|d by the|
|00001920| 20 63 75 72 72 65 6e 74 | 0a 62 75 66 66 65 72 2e | current|.buffer.|
|00001930| 1f 0a 28 61 75 74 6f 6c | 6f 61 64 20 27 65 64 69 |..(autol|oad 'edi|
|00001940| 66 66 2d 6d 65 72 67 65 | 2d 72 65 76 69 73 69 6f |ff-merge|-revisio|
|00001950| 6e 73 20 22 65 64 69 66 | 66 22 20 27 28 23 24 20 |ns "edif|f" '(#$ |
|00001960| 2e 20 36 33 32 31 29 20 | 74 20 6e 69 6c 29 0a 23 |. 6321) |t nil).#|
|00001970| 40 31 35 36 20 52 75 6e | 20 45 64 69 66 66 20 62 |@156 Run| Ediff b|
|00001980| 79 20 6d 65 72 67 69 6e | 67 20 74 77 6f 20 72 65 |y mergin|g two re|
|00001990| 76 69 73 69 6f 6e 73 20 | 6f 66 20 61 20 66 69 6c |visions |of a fil|
|000019a0| 65 20 77 69 74 68 20 61 | 20 63 6f 6d 6d 6f 6e 20 |e with a| common |
|000019b0| 61 6e 63 65 73 74 6f 72 | 2e 0a 54 68 65 20 66 69 |ancestor|..The fi|
|000019c0| 6c 65 20 69 73 20 74 68 | 65 20 74 68 65 20 6f 70 |le is th|e the op|
|000019d0| 74 69 6f 6e 61 6c 20 46 | 49 4c 45 20 61 72 67 75 |tional F|ILE argu|
|000019e0| 6d 65 6e 74 20 6f 72 20 | 74 68 65 20 66 69 6c 65 |ment or |the file|
|000019f0| 20 76 69 73 69 74 65 64 | 20 62 79 20 74 68 65 20 | visited| by the |
|00001a00| 63 75 72 72 65 6e 74 0a | 62 75 66 66 65 72 2e 1f |current.|buffer..|
|00001a10| 0a 28 61 75 74 6f 6c 6f | 61 64 20 27 65 64 69 66 |.(autolo|ad 'edif|
|00001a20| 66 2d 6d 65 72 67 65 2d | 72 65 76 69 73 69 6f 6e |f-merge-|revision|
|00001a30| 73 2d 77 69 74 68 2d 61 | 6e 63 65 73 74 6f 72 20 |s-with-a|ncestor |
|00001a40| 22 65 64 69 66 66 22 20 | 27 28 23 24 20 2e 20 36 |"ediff" |'(#$ . 6|
|00001a50| 35 31 37 29 20 74 20 6e | 69 6c 29 0a 23 40 31 39 |517) t n|il).#@19|
|00001a60| 30 20 52 75 6e 20 45 64 | 69 66 66 2d 6d 65 72 67 |0 Run Ed|iff-merg|
|00001a70| 65 20 6f 6e 20 61 70 70 | 72 6f 70 72 69 61 74 65 |e on app|ropriate|
|00001a80| 20 72 65 76 69 73 69 6f | 6e 73 20 6f 66 20 74 68 | revisio|ns of th|
|00001a90| 65 20 73 65 6c 65 63 74 | 65 64 20 66 69 6c 65 2e |e select|ed file.|
|00001aa0| 0a 46 69 72 73 74 20 72 | 75 6e 20 61 66 74 65 72 |.First r|un after|
|00001ab0| 20 60 4d 2d 78 20 63 76 | 73 2d 75 70 64 61 74 65 | `M-x cv|s-update|
|00001ac0| 27 2e 20 54 68 65 6e 20 | 70 6c 61 63 65 20 74 68 |'. Then |place th|
|00001ad0| 65 20 63 75 72 73 6f 72 | 20 6f 6e 20 61 20 6c 69 |e cursor| on a li|
|00001ae0| 6e 65 20 64 65 73 63 72 | 69 62 69 6e 67 20 61 0a |ne descr|ibing a.|
|00001af0| 66 69 6c 65 20 61 6e 64 | 20 74 68 65 6e 20 72 75 |file and| then ru|
|00001b00| 6e 20 60 72 75 6e 2d 65 | 64 69 66 66 2d 66 72 6f |n `run-e|diff-fro|
|00001b10| 6d 2d 63 76 73 2d 62 75 | 66 66 65 72 27 2e 1f 0a |m-cvs-bu|ffer'...|
|00001b20| 28 61 75 74 6f 6c 6f 61 | 64 20 27 72 75 6e 2d 65 |(autoloa|d 'run-e|
|00001b30| 64 69 66 66 2d 66 72 6f | 6d 2d 63 76 73 2d 62 75 |diff-fro|m-cvs-bu|
|00001b40| 66 66 65 72 20 22 65 64 | 69 66 66 22 20 27 28 23 |ffer "ed|iff" '(#|
|00001b50| 24 20 2e 20 36 37 35 34 | 29 20 74 20 6e 69 6c 29 |$ . 6754|) t nil)|
|00001b60| 0a 23 40 34 30 20 52 75 | 6e 20 45 64 69 66 66 20 |.#@40 Ru|n Ediff |
|00001b70| 62 79 20 70 61 74 63 68 | 69 6e 67 20 53 4f 55 52 |by patch|ing SOUR|
|00001b80| 43 45 2d 46 49 4c 45 4e | 41 4d 45 2e 1f 0a 28 61 |CE-FILEN|AME...(a|
|00001b90| 75 74 6f 6c 6f 61 64 20 | 27 65 64 69 66 66 2d 70 |utoload |'ediff-p|
|00001ba0| 61 74 63 68 2d 66 69 6c | 65 20 22 65 64 69 66 66 |atch-fil|e "ediff|
|00001bb0| 22 20 27 28 23 24 20 2e | 20 37 30 31 34 29 20 74 |" '(#$ .| 7014) t|
|00001bc0| 20 6e 69 6c 29 0a 23 40 | 33 36 20 52 75 6e 20 45 | nil).#@|36 Run E|
|00001bd0| 64 69 66 66 20 62 79 20 | 70 61 74 63 68 69 6e 67 |diff by |patching|
|00001be0| 20 42 55 46 46 45 52 2d | 4e 41 4d 45 2e 1f 0a 28 | BUFFER-|NAME...(|
|00001bf0| 61 75 74 6f 6c 6f 61 64 | 20 27 65 64 69 66 66 2d |autoload| 'ediff-|
|00001c00| 70 61 74 63 68 2d 62 75 | 66 66 65 72 20 22 65 64 |patch-bu|ffer "ed|
|00001c10| 69 66 66 22 20 27 28 23 | 24 20 2e 20 37 31 31 35 |iff" '(#|$ . 7115|
|00001c20| 29 20 74 20 6e 69 6c 29 | 0a 28 62 79 74 65 2d 63 |) t nil)|.(byte-c|
|00001c30| 6f 64 65 20 22 c0 c1 c2 | 5c 22 88 c0 c3 c4 5c 22 |ode "...|\"....\"|
|00001c40| 87 22 20 5b 64 65 66 61 | 6c 69 61 73 20 65 70 61 |." [defa|lias epa|
|00001c50| 74 63 68 20 65 64 69 66 | 66 2d 70 61 74 63 68 2d |tch edif|f-patch-|
|00001c60| 66 69 6c 65 20 65 70 61 | 74 63 68 2d 62 75 66 66 |file epa|tch-buff|
|00001c70| 65 72 20 65 64 69 66 66 | 2d 70 61 74 63 68 2d 62 |er ediff|-patch-b|
|00001c80| 75 66 66 65 72 5d 20 33 | 29 0a 23 40 31 39 35 20 |uffer] 3|).#@195 |
|00001c90| 52 75 6e 20 45 64 69 66 | 66 20 62 79 20 63 6f 6d |Run Edif|f by com|
|00001ca0| 70 61 72 69 6e 67 20 76 | 65 72 73 69 6f 6e 73 20 |paring v|ersions |
|00001cb0| 6f 66 20 61 20 66 69 6c | 65 2e 0a 54 68 65 20 66 |of a fil|e..The f|
|00001cc0| 69 6c 65 20 69 73 20 61 | 6e 20 6f 70 74 69 6f 6e |ile is a|n option|
|00001cd0| 61 6c 20 46 49 4c 45 20 | 61 72 67 75 6d 65 6e 74 |al FILE |argument|
|00001ce0| 20 6f 72 20 74 68 65 20 | 66 69 6c 65 20 76 69 73 | or the |file vis|
|00001cf0| 69 74 65 64 20 62 79 20 | 74 68 65 20 63 75 72 72 |ited by |the curr|
|00001d00| 65 6e 74 0a 62 75 66 66 | 65 72 2e 20 55 73 65 20 |ent.buff|er. Use |
|00001d10| 60 76 63 2e 65 6c 27 20 | 6f 72 20 60 72 63 73 2e |`vc.el' |or `rcs.|
|00001d20| 65 6c 27 20 64 65 70 65 | 6e 64 69 6e 67 20 6f 6e |el' depe|nding on|
|00001d30| 20 60 65 64 69 66 66 2d | 76 65 72 73 69 6f 6e 2d | `ediff-|version-|
|00001d40| 63 6f 6e 74 72 6f 6c 2d | 70 61 63 6b 61 67 65 27 |control-|package'|
|00001d50| 2e 1f 0a 28 61 75 74 6f | 6c 6f 61 64 20 27 65 64 |...(auto|load 'ed|
|00001d60| 69 66 66 2d 72 65 76 69 | 73 69 6f 6e 20 22 65 64 |iff-revi|sion "ed|
|00001d70| 69 66 66 22 20 27 28 23 | 24 20 2e 20 37 33 31 32 |iff" '(#|$ . 7312|
|00001d80| 29 20 74 20 6e 69 6c 29 | 0a 28 64 65 66 61 6c 69 |) t nil)|.(defali|
|00001d90| 61 73 20 27 65 72 65 76 | 69 73 69 6f 6e 20 27 65 |as 'erev|ision 'e|
|00001da0| 64 69 66 66 2d 72 65 76 | 69 73 69 6f 6e 29 0a 23 |diff-rev|ision).#|
|00001db0| 40 39 37 20 52 65 74 75 | 72 6e 20 73 74 72 69 6e |@97 Retu|rn strin|
|00001dc0| 67 20 64 65 73 63 72 69 | 62 69 6e 67 20 74 68 65 |g descri|bing the|
|00001dd0| 20 76 65 72 73 69 6f 6e | 20 6f 66 20 45 64 69 66 | version| of Edif|
|00001de0| 66 2e 0a 57 68 65 6e 20 | 63 61 6c 6c 65 64 20 69 |f..When |called i|
|00001df0| 6e 74 65 72 61 63 74 69 | 76 65 6c 79 2c 20 64 69 |nteracti|vely, di|
|00001e00| 73 70 6c 61 79 73 20 74 | 68 65 20 76 65 72 73 69 |splays t|he versi|
|00001e10| 6f 6e 2e 1f 0a 28 61 75 | 74 6f 6c 6f 61 64 20 27 |on...(au|toload '|
|00001e20| 65 64 69 66 66 2d 76 65 | 72 73 69 6f 6e 20 22 65 |ediff-ve|rsion "e|
|00001e30| 64 69 66 66 22 20 27 28 | 23 24 20 2e 20 37 36 30 |diff" '(|#$ . 760|
|00001e40| 34 29 20 74 20 6e 69 6c | 29 0a 23 40 36 34 20 44 |4) t nil|).#@64 D|
|00001e50| 69 73 70 6c 61 79 20 45 | 64 69 66 66 27 73 20 6d |isplay E|diff's m|
|00001e60| 61 6e 75 61 6c 2e 0a 57 | 69 74 68 20 6f 70 74 69 |anual..W|ith opti|
|00001e70| 6f 6e 61 6c 20 4e 4f 44 | 45 2c 20 67 6f 65 73 20 |onal NOD|E, goes |
|00001e80| 74 6f 20 74 68 61 74 20 | 6e 6f 64 65 2e 1f 0a 28 |to that |node...(|
|00001e90| 61 75 74 6f 6c 6f 61 64 | 20 27 65 64 69 66 66 2d |autoload| 'ediff-|
|00001ea0| 64 6f 63 75 6d 65 6e 74 | 61 74 69 6f 6e 20 22 65 |document|ation "e|
|00001eb0| 64 69 66 66 22 20 27 28 | 23 24 20 2e 20 37 37 35 |diff" '(|#$ . 775|
|00001ec0| 39 29 20 74 20 6e 69 6c | 29 0a 28 70 72 6f 76 69 |9) t nil|).(provi|
|00001ed0| 64 65 20 27 65 64 69 66 | 66 2d 61 75 74 6f 6c 6f |de 'edif|f-autolo|
|00001ee0| 61 64 73 29 0a | |ads). | |
+--------+-------------------------+-------------------------+--------+--------+
